Merge from emacs-24; up to r111311
authorGlenn Morris <rgm@gnu.org>
Sat, 2 Mar 2013 20:10:05 +0000 (12:10 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 2 Mar 2013 20:10:05 +0000 (12:10 -0800)
commitfa2b3d3de39be1c5266a662077b25189bd05470d
tree7009d53f676031ae3b3533d882abe871102b4036
parent1163ea72c40163db4fafbae3bb3a1c8fb3a9ba56
parent658d1b9ce5d2709074d640490af7c06817f670f6
Merge from emacs-24; up to r111311
etc/NEWS
src/ChangeLog
src/lisp.h